test: fix JUnit test method access modifiers and annotations #7635

contrueCT · 2025-09-13T12:44:37Z

I have read the CONTRIBUTING.md guidelines.
I have registered the PR changes.

Ⅰ. Describe what this PR did

This PR corrects JUnit test method access modifiers and annotation usage:

Fix @BeforeEach/@AfterEach method visibility in JUnit 5 tests (private → public)
Fix @Rule field access modifier in JUnit 4 tests (private → public)
Remove inappropriate @Test annotation from utility methods

These changes ensure proper JUnit framework functionality and test execution.

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

YongGoose

Are there similar cases elsewhere?
If so, it would be good to address all of them in this PR.

codecov · 2025-09-14T02:11:11Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 67.28%. Comparing base (8722d51) to head (43b5859).
⚠️ Report is 1 commits behind head on 2.x.

Additional details and impacted files

@@            Coverage Diff            @@
##                2.x    #7635   +/-   ##
=========================================
  Coverage     67.28%   67.28%           
- Complexity      992      994    +2     
=========================================
  Files          1323     1323           
  Lines         50155    50155           
  Branches       5928     5928           
=========================================
+ Hits          33746    33748    +2     
+ Misses        13488    13482    -6     
- Partials       2921     2925    +4

see 11 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@test

- Fix @BeforeEach/@AfterEach methods visibility in JUnit 5 tests - Fix @rule field access modifier from private to public in JUnit 4 tests - Remove inappropriate @test annotation from utility method

contrueCT · 2025-09-14T16:02:28Z

Are there similar cases elsewhere? If so, it would be good to address all of them in this PR.

Thanks for your suggestion! I’ve checked and fixed all similar cases in the test classes. Could you please take another look when you get a chance?

YongGoose · 2025-09-15T09:12:36Z

Thanks for your suggestion! I’ve checked and fixed all similar cases in the test classes. Could you please take another look when you get a chance?

Please use JUnit5 instead of JUnit4.

contrueCT · 2025-09-15T14:24:21Z

Done. Replaced all JUnit4 references with JUnit5. Please take another look when you get a chance.

contrueCT · 2025-09-23T08:45:43Z

@YongGoose I've updated the PR based on your feedback. Could you please take another look when you have time? Thanks!

…ases

contrueCT · 2025-09-24T09:24:17Z

The CI failure in the seata-config-zk module only occurs in the Java 8 build and is unrelated to my changes. The same tests pass successfully in Java 17 and Java 21, indicating a compatibility issue between ZooKeeper client and Java 8 in the CI environment—not a code problem.

YoWuwuuuw · 2025-09-26T08:19:14Z

...cd3/src/test/java/org/apache/seata/discovery/registry/etcd3/EtcdRegistryServiceImplTest.java

This test class is an integration test that relies on a real etcd service. Because it is marked with @Disable, CI will not be triggered. I think it is helpful to include a screenshot of the active triggering test in the description for reference.

contrueCT · 2025-10-16T05:01:47Z

Hi @YongGoose ,
I've addressed all the feedback you left in your review https://github.com/apache/incubator-seata/pull/7635#issuecomment-3291173245
Could you please take another look when you have a moment?
Thanks a lot! 😊

slievrly · 2025-10-17T06:13:39Z

@YongGoose Pls take a look.

YongGoose

Please apply spotless :)

Once you’ve fixed the Spotless issues, please ping me and I’ll give my approval.

YongGoose · 2025-10-18T00:12:14Z

...cd3/src/test/java/org/apache/seata/discovery/registry/etcd3/EtcdRegistryServiceImplTest.java

        EtcdListener etcdListener = new EtcdListener();
-        registryService.subscribe(CLUSTER_NAME, etcdListener);
-        // 3.delete instance,see if the listener can be notified
+        registryService.subscribe(DEFAULT_TX_GROUP, etcdListener);


Just curious, was there any particular reason for using DEFAULT_TX_GROUP instead of CLUSTER_NAME?

Yes! The subscribe() and lookup() methods expect a transaction service group, not an etcd cluster name.
The original code had mismatched key paths:

Registration: registry-seata-<DEFAULT_TX_GROUP>/...

Subscription: registry-seata-<CLUSTER_NAME>/...

Even though both values were "default", using DEFAULT_TX_GROUP is semantically correct and matches how Seata actually works - clients look up services by transaction group.

contrueCT · 2025-10-18T15:24:48Z

I've fixed the Spotless issues, plaese take a look : ) @YongGoose

Copilot

Pull Request Overview

This PR corrects JUnit test method access modifiers and annotation usage to ensure proper test execution. The changes address framework requirements where lifecycle methods and fields must be public rather than private, and remove incorrect @Test annotations from utility methods.

Key Changes:

Changed @BeforeEach and @AfterEach annotated methods from private to public visibility
Removed @Test annotations from utility/helper methods that are not actual test cases
Refactored etcd3 test to use JUnit 5 lifecycle annotations instead of JUnit 4's @Rule

Reviewed Changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
test/src/test/java/org/apache/seata/at/oracle/SupportOracleDataTypeTest.java	Removed `@Test` annotation from `testTypeSql` utility method
test/src/test/java/org/apache/seata/at/ATModeSupportDataBaseDataTypeTest.java	Removed `@Test` annotation from helper method and fixed method call bugs
server/src/test/java/org/apache/seata/server/ParameterParserTest.java	Changed `@BeforeEach` method from private to public
rm-datasource/src/test/java/org/apache/seata/rm/datasource/undo/BaseH2Test.java	Changed `@BeforeEach` method from private to public
discovery/seata-discovery-etcd3/src/test/java/org/apache/seata/discovery/registry/etcd3/EtcdRegistryServiceImplTest.java	Migrated from JUnit 4 `@Rule` to JUnit 5 lifecycle methods with proper setup/teardown
discovery/seata-discovery-etcd3/pom.xml	Added mockito-core test dependency
changes/zh-cn/2.x.md	Added changelog entry in Chinese
changes/en-us/2.x.md	Added changelog entry in English

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

YongGoose

LGTM

YongGoose · 2025-10-27T14:21:35Z

@funky-eyes

I think this pr can be merged now :)

slievrly

LGTM

contrueCT and others added 7 commits September 13, 2025 19:47

fix: correct JUnit 5 lifecycle method visibility

569241e

Fix JUnit 5 lifecycle method visibility in changelog

13b93a3

Fix JUnit 5 lifecycle method visibility in changelog

85f24e2

Merge remote-tracking branch 'origin/patch-1' into 2.x

0e3d952

Merge remote-tracking branch 'origin/patch-2' into 2.x

aa5114a

Update pull request reference in 2.x.md

a7d4b12

Update pull request reference in 2.x.md

6554f46

YongGoose requested changes Sep 14, 2025

View reviewed changes

contrueCT added 2 commits September 14, 2025 23:52

fix: correct JUnit test method access modifiers and annotations

b4dfb3a

- Fix @BeforeEach/@AfterEach methods visibility in JUnit 5 tests - Fix @rule field access modifier from private to public in JUnit 4 tests - Remove inappropriate @test annotation from utility method

Merge remote-tracking branch 'origin/2.x' into 2.x

c518bb3

contrueCT requested a review from YongGoose September 14, 2025 15:56

contrueCT changed the title ~~test: fix JUnit 5 lifecycle method visibility~~ test: fix JUnit test method access modifiers and annotations Sep 14, 2025

fix JUnit test method access modifiers and annotations in changelog

6f7990c

refactor: migrate EtcdRegistryServiceImplTest from JUnit 4 to JUnit 5

ad95dfc

xingfudeshi and others added 5 commits September 18, 2025 11:46

Merge branch '2.x' into 2.x

53dfaa2

fix: format code by spotless

033c627

Merge remote-tracking branch 'origin/2.x' into 2.x

dab561a

Merge branch '2.x' into 2.x

3cf788e

Merge branch '2.x' into 2.x

9d2baee

xingfudeshi and others added 3 commits September 24, 2025 12:30

Merge branch '2.x' into 2.x

54f9a30

fix: correct updateSql assignment in DATE_TYPE and BINARY_TYPE test c…

6e403e3

…ases

Merge remote-tracking branch 'origin/2.x' into 2.x

4117cd8

YoWuwuuuw reviewed Sep 26, 2025

View reviewed changes

Merge branch '2.x' into 2.x

6c2af4e

Merge branch '2.x' into 2.x

7adbefb

slievrly and others added 2 commits October 17, 2025 14:13

Merge branch '2.x' into 2.x

1716ed2

Merge branch '2.x' into 2.x

ac9973c

This comment was marked as outdated.

Sign in to view

YongGoose requested changes Oct 18, 2025

View reviewed changes

YongGoose reviewed Oct 18, 2025

View reviewed changes

contrueCT and others added 3 commits October 18, 2025 23:12

fix:fix the Spotless issues

9d2a0b3

fix:fix the Spotless issues

44011fd

Merge branch '2.x' into 2.x

2c9e734

YongGoose requested review from YongGoose and Copilot October 22, 2025 02:17

Copilot AI reviewed Oct 22, 2025

View reviewed changes

Merge branch '2.x' into 2.x

3d4a837

YongGoose approved these changes Oct 23, 2025

View reviewed changes

Merge branch '2.x' into 2.x

4c7bf9d

YongGoose requested a review from funky-eyes October 27, 2025 14:20

Merge branch '2.x' into 2.x

43b5859

slievrly added this to the 2.6.0 milestone Nov 1, 2025

slievrly approved these changes Nov 1, 2025

View reviewed changes

slievrly merged commit f9345e0 into apache:2.x Nov 1, 2025
11 checks passed

test: fix JUnit test method access modifiers and annotations #7635

test: fix JUnit test method access modifiers and annotations #7635

Uh oh!

Conversation

contrueCT commented Sep 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

Uh oh!

YongGoose left a comment

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Sep 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

contrueCT commented Sep 14, 2025

Uh oh!

YongGoose commented Sep 15, 2025

Uh oh!

contrueCT commented Sep 15, 2025

Uh oh!

contrueCT commented Sep 23, 2025

Uh oh!

contrueCT commented Sep 24, 2025

Uh oh!

YoWuwuuuw Sep 26, 2025

Choose a reason for hiding this comment

Uh oh!

contrueCT commented Oct 16, 2025

Uh oh!

slievrly commented Oct 17, 2025

Uh oh!

This comment was marked as outdated.

Uh oh!

YongGoose left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

YongGoose Oct 18, 2025

Choose a reason for hiding this comment

Uh oh!

contrueCT Oct 18, 2025

Choose a reason for hiding this comment

Uh oh!

contrueCT commented Oct 18, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

YongGoose left a comment

Choose a reason for hiding this comment

Uh oh!

YongGoose commented Oct 27, 2025

Uh oh!

slievrly left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

contrueCT commented Sep 13, 2025 •

edited

Loading

codecov bot commented Sep 14, 2025 •

edited

Loading

YongGoose left a comment •

edited

Loading